environment: Preserve time 0 when animations are disabled

There are cases where the animation time is set to 0 on purpose
in order to not animate. When animations are disabled via
/org/gnome/desktop/interface/enable-animations those animation
times are increased from 0 to 1. This makes the "Caps lock is on."
message appear unconditionally in the lockscreen for a brief moment.

Select the minimum between the two values. So that an animation time
0 is preserved instead of being replaced by 1.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2471>

diff --git a/js/ui/environment.js b/js/ui/environment.js
index 4853a83d55a216c0736d8a18a93ee79ea268df7e..8c790da6725631e538c75cc5d5d94bb86f69bb50 100644 (file)
--- a/js/ui/environment.js
+++ b/js/ui/environment.js
@@ -464,7 +464,7 @@ function adjustAnimationTime(msecs) {
     let settings = St.Settings.get();
 
     if (!settings.enable_animations)
-        return 1;
+        return Math.min(msecs, 1);
     return settings.slow_down_factor * msecs;
 }